Subtract the multi-monitor offset from x and y before setting up the

2007-05-30  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Subtract the
	multi-monitor offset from x and y before setting up the rectangle
	for ClipCursor(). Fixes #442326.

svn path=/trunk/; revision=17988

diff --git a/ChangeLog b/ChangeLog
index 88d2ec31ff3ed563479ca7d4fa9b6f78e693605c..e5b9a66a835f48270a6fd703d9e4a38b9b010fbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-30  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Subtract the
+       multi-monitor offset from x and y before setting up the rectangle
+       for ClipCursor(). Fixes #442326.
+
 2007-05-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkiconview.c (gtk_icon_view_layout): Queue a resize

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 285b736cebca14ffb73e29643e842d11b1d818eb..5059a88993c3d63c097b43f0a5e1040f84d2e6bc 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -565,6 +565,9 @@ gdk_pointer_grab (GdkWindow    *window,
          gdk_window_get_origin (confine_to, &x, &y);
          gdk_drawable_get_size (confine_to, &width, &height);
 
+         x -= _gdk_offset_x;
+         y -= _gdk_offset_y;
+
          rect.left = x;
          rect.top = y;
          rect.right = x + width;